Skip to content

build(deps): bump rustls to 0.23.46 with webpki and aws-lc-rs - #792

Merged
jussielo-amd merged 1 commit into
mainfrom
chore/bump-rustls-0.23.46
Oct 29, 2026
Merged

jussielo-amd merged 1 commit into
mainfrom
chore/bump-rustls-0.23.46

Conversation

@jussielo-amd

Copy link
Copy Markdown
Collaborator

Why

rustls 0.23.41 is affected by four published advisories. GHSA-2mjx-qc3c-rqvc (medium: TLS 1.3 handshake messages accepted across encryption level boundaries) is fixed in 0.23.45. GHSA-c8m5-c952-6cm4 (medium: session Debug output exposes TLS master secrets and resumption PSKs), GHSA-w44r-93j7-qv28 (low) and GHSA-h2v8-394m-p7vv (low) are fixed in 0.23.46.

A plain cargo update -p rustls stops at 0.23.43, which fixes none of them: 0.23.44 and later require rustls-webpki ^0.103.14 and aws-lc-rs ^1.18, and the lockfile holds 0.103.13 and 1.17.0. So the fix has to move the three crates together.

What changes

Cargo.lock only; no Cargo.toml changes.

Crate Before After
rustls 0.23.41 0.23.46
rustls-webpki 0.103.13 0.103.16
aws-lc-rs 1.17.0 1.18.2
aws-lc-sys 0.41.0 0.46.0
pkg-config not present 0.3.34 (now a dependency of aws-lc-sys)

MANIFEST.md and THIRD_PARTY_NOTICES.txt are regenerated with cargo xtask manifest and cargo xtask tpn.

rustls-webpki and aws-lc-rs take the newest releases outside the 7-day cooldown that .github/dependabot.yml sets for cargo updates, which matters because a new build.rs runs on CI before anyone reads the diff. aws-lc-rs 1.19.0, published on 2026-10-28, was inside that window when this bump was prepared, so it is deliberately not taken.

Two behaviour changes come with the newer minors and are not needed for the advisory fixes:

  • rustls-webpki 0.103.16 ships a list of eight distrusted intermediate public keys, and any certificate path containing one fails verification.
  • aws-lc-sys 0.46.0 detects an AWS-LC already present on the build host, via OPENSSL_DIR, OPENSSL_INCLUDE_DIR/OPENSSL_LIB_DIR or pkg-config, and uses it only if it validates as AWS-LC; otherwise it builds the vendored copy as before. Setting AWS_LC_SYS_USE_SYSTEM=0 turns detection off if release builds must not depend on what is installed on the host.

Verification

Run locally against this lockfile:

  • cargo check --workspace --all-targets --locked, cargo clippy --locked --workspace --all-targets -- -D warnings and cargo test --workspace --locked all pass (4,733 tests passed, 0 failed, 17 ignored).
  • cargo xtask manifest --check and cargo xtask tpn --check pass, and the prek hooks pass on the three changed files.
  • The dependency graph contains one version each of rustls, rustls-webpki, aws-lc-rs and aws-lc-sys.

Not verified locally: the Windows (MSVC) and manylinux builds of aws-lc-sys 0.46, and TLS handshakes against real provider endpoints, since a local run only shows that the code builds and the tests pass.

Scope

Only the TLS stack named above moves; every other locked version is unchanged.

  • If this PR fixes a bug, searched tests/e2e-cucumber/expectations.toml for the fixed ticket ID and removed/narrowed any now-stale xfail rows. (N/A: dependency bump, no ticket and no bug fix in this repo's code.)
  • If this PR adds a new subcommand or subsystem, its domain implementation lives in its own file per docs/architecture.md. (N/A)
  • Every new or changed user-facing message was read against the code path that runs after it, and its test asserts the resulting state — not only the wording — per AGENTS.md §3. (N/A: no user-facing messages change.)

rustls 0.23.41 is affected by GHSA-2mjx-qc3c-rqvc (fixed in 0.23.45) and by
GHSA-c8m5-c952-6cm4, GHSA-w44r-93j7-qv28 and GHSA-h2v8-394m-p7vv (fixed in
0.23.46). `cargo update -p rustls` stops at 0.23.43, because 0.23.44 and later
require rustls-webpki ^0.103.14 and aws-lc-rs ^1.18, so move the three together.

rustls-webpki and aws-lc-rs take the newest releases that are outside the 7-day
cooldown dependabot.yml sets for cargo updates: rustls-webpki 0.103.16 and
aws-lc-rs 1.18.2, not 1.19.0, which is only hours old. aws-lc-sys follows to
0.46.0 and brings pkg-config 0.3.34 into the lockfile.

MANIFEST.md and THIRD_PARTY_NOTICES.txt are regenerated with `cargo xtask
manifest` and `cargo xtask tpn`.

Signed-off-by: Jussi Elo <jussi.elo@amd.com>
@jussielo-amd

Copy link
Copy Markdown
Collaborator Author

Supersedes #768, which is closed. That PR bumped rustls only to 0.23.43, which predates the advisory fixes; reaching 0.23.46 needs rustls-webpki and aws-lc-rs to move too, so this PR updates the three together.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

The AWS-LC upgrade changes automatic system-library selection, requiring Windows/MSVC and manylinux CI confirmation and provider TLS validation that were not performed locally and exceed this review’s runtime capabilities.

No open issues 🎉

What changed in this PR

Updates the workspace’s locked TLS dependencies to address the four rustls advisories described in the PR, without changing dependency declarations or application code.

Changes:

  • Bumps rustls to 0.23.46 alongside compatible rustls-webpki and AWS-LC dependencies.
  • Adds pkg-config as an aws-lc-sys build dependency.
  • Regenerates the dependency manifest and third-party notices to reflect the updated versions.
File Description
THIRD_PARTY_NOTICES.txt Updates component versions in license notices.
MANIFEST.md Records updated TLS dependencies and adds pkg-config.
Cargo.lock Pins the updated TLS stack, checksums, and pkg-config dependency.

Review effort: Balanced

@jussielo-amd
jussielo-amd marked this pull request as ready for review October 29, 2026 09:56
@jussielo-amd
jussielo-amd requested a review from a team as a code owner October 29, 2026 09:56

@juhovainio juhovainio left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lockfile-only bump (Cargo.lock, MANIFEST.md, THIRD_PARTY_NOTICES.txt): rustls 0.23.46, rustls-webpki 0.103.16, aws-lc-rs 1.18.2, aws-lc-sys 0.46.0, plus a new pkg-config 0.3.34. Each crate appears once, so no duplicate versions, and MANIFEST/THIRD_PARTY_NOTICES match the lockfile. DCO and commit signatures are fine and I found nothing that shouldn't be in a public diff. This is a diff-level read; I did not build or run it locally.

Non-blocking notes:

  1. aws-lc-sys 0.46 auto-detects a system AWS-LC. AWS_LC_SYS_USE_SYSTEM=0 is mentioned in the PR text but I don't see it set in any release script. Consider setting it in the release workflows so release artifacts never link against a host library.
  2. webpki 0.103.16 distrusts 8 intermediate keys, and nothing in the tests covers that.
  3. Windows MSVC and manylinux builds of aws-lc-sys, and live TLS handshakes, haven't been verified locally (as the description says).

CI at review time: everything required is green except Strix Halo Ubuntu release/nightly, which were cancelled at the E2E step after ~45m (looks like runner contention; a rerun should confirm), and MI300X/W7900 E2E, which were still pending.

@jussielo-amd
jussielo-amd added this pull request to the merge queue Oct 29, 2026
Merged via the queue into main with commit 6ecb30a Oct 29, 2026
31 of 33 checks passed
@jussielo-amd
jussielo-amd deleted the chore/bump-rustls-0.23.46 branch October 29, 2026 14:16
jussielo-amd added a commit to jussielo-amd/rocm-cli that referenced this pull request Oct 30, 2026
…OCm#796)

* ci(release): always build aws-lc-sys from source in shipped builds

aws-lc-sys 0.46 and later detect an AWS-LC already present on the build host
(OPENSSL_DIR, OPENSSL_INCLUDE_DIR/OPENSSL_LIB_DIR or pkg-config) and link it
when it validates. The manylinux build container installs pkgconfig, so a
shipped binary could end up depending on whatever the host provides.

Set AWS_LC_SYS_USE_SYSTEM=0 in the release and nightly workflows, and for the
Linux and Windows PR bundle builds in ci.yml, so the vendored copy is always
built. The manylinux container does not inherit the workflow environment, so
forward the variable into each docker run.

The locked aws-lc-sys is still 0.41.0, which ignores the variable; it takes
effect once the lockfile moves to 0.46 (ROCm#792).

Signed-off-by: Jussi Elo <jussi.elo@amd.com>

* test(ci): pin the vendored aws-lc-sys opt-out in the workflow contract

Dropping `-e AWS_LC_SYS_USE_SYSTEM` from a manylinux build container, or
changing the value a build resolves, would silently revert that build to host
AWS-LC detection with no other symptom.

For every shipped release `cargo build` step in release.yml, nightly.yml and
ci.yml, resolve the variable the way GitHub does (step env, then job env, then
workflow env) and require 0, and require the manylinux docker run that builds
to forward it with `-e` or `--env`. The expected number of shipped builds is
pinned per workflow, so a new build has to pin the variable too. The checker
is also exercised on inline YAML, covering each env layer, the accepted
forwarding spellings, unnamed steps, flag order and comments.

Signed-off-by: Jussi Elo <jussi.elo@amd.com>

---------

Signed-off-by: Jussi Elo <jussi.elo@amd.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants